projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6fb8e45) | patch
(vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 7 Oct 2002 16:24:42 +0000 (16:24 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 7 Oct 2002 16:24:42 +0000 (16:24 +0000)
commit82ed0ec3addb014a612e05959ff9410117e4206a
treefc991c44a5c598fb695b9dc0407c9c6149dcf10etree | snapshot
parent6fb8e4595e490e8cb9e7b8bfd6be82cf5a8e06b1commit | diff
(vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts
in case some other package redefined it.
(vc-resolve-conflicts): Make it into an alias for smerge-ediff.
lisp/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.